travis-ci: Move helper function to before we start building anything
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 28 Nov 2016 17:23:08 +0000 (17:23 +0000)
committerAtomic Bot <atomic-devel@projectatomic.io>
Tue, 29 Nov 2016 14:11:50 +0000 (14:11 +0000)
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Closes: #600
Approved by: cgwalters

tests/ci-build.sh

index 42c2dcffda9a91c2bce98b62f281db8889376b66..ae52787e0b55d5b11e48b4294acf0c0b0619a63f 100755 (executable)
@@ -44,6 +44,12 @@ if [ -n "$ci_docker" ]; then
         tests/ci-build.sh
 fi
 
+maybe_fail_tests () {
+    if [ "$ci_test_fatal" = yes ]; then
+        exit 1
+    fi
+}
+
 NOCONFIGURE=1 ./autogen.sh
 
 srcdir="$(pwd)"
@@ -58,13 +64,6 @@ make="make -j${ci_parallel} V=1 VERBOSE=1"
     "$@"
 
 ${make}
-
-maybe_fail_tests () {
-    if [ "$ci_test_fatal" = yes ]; then
-        exit 1
-    fi
-}
-
 [ "$ci_test" = no ] || ${make} check || maybe_fail_tests
 # TODO: if ostree aims to support distcheck, run that too